Merge "Do not run unfold taskbar animation when in portrait" into tm-dev