Merge "Fix for AppBarLayout\'s scrolling view not laying out WIP" into nyc-dev
am: 95c069158d

* commit '95c069158d8fa777c4f930dad27c2a6ac59ec741':
  Fix for AppBarLayout's scrolling view not laying out WIP

Change-Id: If511783d14f09fed5fc4fff3e1f85a1cbd4dc75c