Merge "Create flag for multi-select edit mode" into udc-dev