Merge "Do not attach tiny taskbar to app during transition." into main