Merge "Fix problems with taskbar floating views on rotation" into tm-dev