Merge "Automatically dismiss SIM combination warnings and selection dialogs." into rvc-qpr-dev