Merge "Make sure that AppBarLayout is laid out correctly" into mnc-ub-dev