Merge "Skip transition if the display has no visible content" into main