Merge "Fix selection expansion detection logic."