Merge "Fix regression in SIM state handling"