Merge "AppBarLayout fixes" into mnc-ub-dev