Merge "Fix 5385186 - Face Unlock no longer shown when first booted"