Merge "Fix selection handles on older API versions" into mnc-dev