Merge "Only validate transformation if we got orientation change" into main