Merge "Enable user graularity for lockdown mode" into sc-dev