[OE-4053] Fixed on-demand element styling
Merge branch 'release/1.6' of github.com:openeyes/OpenEyes into release/1.6