Merge "Don't allow the status bar to collapse things we're touching." into jb-mr1-dev