Merge "Fix for the notification panel getting stuck open."