Merge "Restore behavior of isUserRunning"