Merge "Use current user for lockdown setting" into pi-dev