Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev