Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev