Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev