Merge "hide the correct text, and more text, on bounce" into jb-mr1-lockscreen-dev