Merge "Don't animate burn-in return when it wasn't applied." into cw-e-dev