Merge "Fix problems of SIM lock screen of eSIM" into oc-mr1-dev