Merge "Relax isUserRunning() when asking about self."