Merge "URIFD way causes leak in PlaybackActivityMonitor"