Merge "Fix janky transition on All Apps tab switch" into jb-mr1.1-dev