Merge "Revert "Fix shade flicker when launching activity from glanceable hub"" into main