Merge "Update media resourceManagerService with the Application pid" into rvc-dev