Merge "Revert "Refresh Notification Shelf layout when it becomes visible"" into main