Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev