Merge "Fix AppBarLayout elevation tests"