fix(carousel): Merge PRs #2798 and #2776 to fix Protractor