Merge "Use disableForUser in StatusBarManager"