Merge "Create ACTIVITY_TYPE_DREAM" into rvc-dev