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 '1d6c2573d4b2824511354d651d7350df327f454f':
  Attempt to fix a bug where SIM progress dialog gets stuck.