Merge "AppBarLayout layout/measure fixes" into mnc-ub-dev