Merge "Apparently SystemUI no longer needs the carousel." into jb-mr2-dev