Merge "Do not hold lock when calling into NotificationManager" into sc-dev