Merge "Wait for all of associated activities done animating" into rvc-dev