Merge "Treat all apps predictions as all app icons when animating icons to their original position" into tm-qpr-dev