Merge "Fix storing the wrong value of mLockdown in setting"