Merge "Fix cutout not updating when switching cutout emulation" into tm-qpr-dev