Merge "Fix media divider animator" into rvc-dev