Merge "Skip passing gesture to bubble when notif expanded" into tm-dev