Merge in RED/ui from RED-939 to master * commit '3d211dc0d40ed635d9346969e3320ccff6baabce': Fixed diagonal watermark