am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev

* commit '6b4ab7f170ea54e5b99cf0635d3803a9407439d7':
  Centering FUL fixes b/7480608