Take "olddisplay" value into the account

Fixes #14824
Closes gh-1566
Ref 73fe1729

(cherry-picked from c34dbf5a)
Conflicts:
	src/effects.js