Merge "Fixes 5429869 Only displaying FaceUnlock when window is focused"