Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev