Merge "Do not use hidden API UserManager#getPrimaryUser"