Merge "Make sure SIM PIN screen shows" into sc-dev