Merge "Don't show Face Unlock on initial boot fixes 6396685" into jb-dev