Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev