Merge "h264 streaming: make profile-level-id optional"