Merge "Trace sections for ScreenDecorations" into tm-qpr-dev