Merge "Fixed two icons shown after switching to single SIM" into main