Merge "Stop switching users when unnecessary"