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