Merge "Prevent crash on SIM Lock settings while rotating" into main