Merge "Enable user graularity for lockdown mode" into rvc-qpr-dev