Merge "AChoreographer: Avoid potential NULL dereference" into rvc-dev