Merge "DisplayDecoration test: destroy layers per display" into main