Merge "Don't touch system_ce until the first user unlock."