Merge "Add Recordings folder to support recording type" into sc-dev