Merge "Use rotation hint to update layout" into main