Merge "Fix memory leak of MediaControlPanel" into udc-dev