Merge "Fix AppBarLayout layout issues" into mnc-ub-dev