Merge "Setting to bypass lock screen upon face unlock"