Merge "Fix display fade-out animation" into rvc-dev