Merge "Confirm parent user's credential when setting lock for profile" into pi-dev