Merge "Use the correct MeasureSpec for ScrollingViewBehavior" into lmp-mr1-ub-dev