Merge "Remove stack scroller references from StatusBar"