Merge "AppBarLayout fixes" into mnc-ub-dev
am: 70500b1abd

* commit '70500b1abd50112e8380e4f330b6103b34486894':
  AppBarLayout fixes