Merge "Invalidate HandleView when handle position may have to be changed." into nyc-dev