Merge "Improved Notification Panel height logic"