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