Merge "Reversing QS long-press effect if no activity launch occurs." into main