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

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