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