Merge "Fix and deprecate lock pattern related settings" into mnc-dev