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