(Android Phoenix) Some cleanups to CoreSelection.java