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

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