Merge "Make All Apps transition smoother" into jb-dev