Merge "Bug 473535 - SelectionLayer.hasRowSelection/hasColSelection has unexpected semantics"