Merge "bouncer: hide more text and frame less." into jb-mr1-lockscreen-dev