Merge "Fix bug #12893337 Crash while set up SIM card lock"