Merge "Fix the premature hiding of notifications while expanding QS." into sc-dev