Revert ONCLR and OPOST changes Upstream-commit: cd35e4beee13a7c193e2a89008cd87d38fcd0161 Component: engine