Merge "Prevent NPE via use of uninitialized mUserManager" into nyc-dev