Merge "Fix hang when error in SIM card communication"