Merge "Listen for EXTRA_PRESENT changes"