Merge "[DO NOT MERGE] Fix logic for storing MediaButtonReceiver" into rvc-qpr-dev