Merge "Fix issue #26695393: Remove NEW_PICTURE and NEW_VIDEO broadcast" into nyc-dev