Merge "Only assert transform hint if the orientation of size is changed" into main