am 34068869: Merge "Making FaceUnlock not pop up for overlays Fixes 5451837...
am 34068869: Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341" into ics-mr0
* commit '34068869':
Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341