Merge "[DO NOT MERGE] Ambient music - Update for favoriting intent" into sc-qpr1-dev