(Android Phoenix) Some cleanups in CoreSelection.java