Merge "Fix AppBarLayout layout issues" into mnc-ub-dev am: 25ce9fa091
am: 81f53d75b5

* commit '81f53d75b5b6efb2b19cc8df881b470aef0d41e9':
  Fix AppBarLayout layout issues