Merge "Fix the execution point of onFrameAvailable/onFrameReplaced callbacks"