Merge "Dismiss SIM PIN screen when eSIM disabled" into sc-dev