Merge "Fix selection off-by-one bug."