Merge "Null Pointer Check on Sim Swap"