Merge "Prevent launcher gestures when back/assistant have activated"