Merge "Adjusted the expand animation to be smooth again" into rvc-dev