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

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