Merge "Use correct user ID for face bypass pref controller" into sc-dev