Merge "Fix AppBarLayout test layouts so that they're visible"