Merge "Fix for deadlock between StatusBarService and NotificationManagerService"