Merge "MediaMetrics: Unify bundle key naming for service set properties"