Merge "IOMX: move max pts gap handling to OMX"