Merge "Handle DISPLAY_DECORATION layers" into tm-dev