Merge "Use the older way to cope with onInvalidSelection()"