Merge "Listen for EXTRA_PRESENT changes" into rvc-qpr-dev