Merge "Redraw ScreenDecorations only if rotation changed" into tm-dev