Merge "display: Do not align down input rotator src height"