Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev