Merge "Stop FaceUnlock when detached from window fixes b/7222226" into jb-mr1-dev