Merge "Fix Launcher icons not animated during unfold" into tm-dev