Merge "Fixing notification background peeking from the bottom when expanding QS" into sc-dev