Merge "Fixed misplacement of cancel(X) button for Face Unlock" into jb-mr1-lockscreen-dev