Merge "Delay auto key frame insertion in realtime configuration"