Merge "Tune fold animation on top of apps" into tm-dev