am 5837a15d: am 1d6c2573: am aebe3b6c: am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev

* commit '5837a15df189968be7cc0c48dbc91f1fd83885fc':
  Attempt to fix a bug where SIM progress dialog gets stuck.