Merge "AppBarLayout overlap layout fix" into mnc-ub-dev