Restore original selection behavior and fix up unit tests for CM change to primary selection default
Merge pull request #7214 from adobe/nj/fix-unit-tests

Restore original selection behavior and fix up unit tests for recent CM change