Merge "Revert "Allow Activity/Service to get media keys across the boot""