am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev

* commit '9ff6d4f8db8d3d7a6f22afa726685feb47694fbe':
  Keyguard sanity checks for when layout is not yet complete