Merge "Fix some minor issues with animating dismiss" into rvc-dev