Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev