am e4728b15: Merge "Stopping Face Unlock immediately on detaching from window...
am e4728b15: Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev
* commit 'e4728b15':
Stopping Face Unlock immediately on detaching from window fixes 7338808