Merge "Update bouncer behavior on tablets." into jb-mr1-lockscreen-dev