Merge "Make mPendingNotifications truly private (mk II)"