Merge "[Unfold transition] Take over only physical display changes" into main