Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev