Form Design can update sys_choice records when no changes are made due to duplicate sys_choice records

Form Design can update sys_choice records when no changes are made due to duplicate sys_choice records

Steps to reproduce
1. Navigate to a list view of the sys_choice table filtered on table=sys_email and Updated in descending order
2. Take note of the last updated date/time
3. Navigate to "System Logs > Emails"
4. Open any record
5. Go to "Configure > Form Design"
6. Add a new View - do not make any changes
7. Click Save
8. Navigate to a list view of the sys_choice table filtered on table=sys_email and Updated in descending order

Expected behavior: No changes to sys_choice records for table=sys_email since the date/time noted in step 2
Actual behavior: Six records on sys_choice for table=sys_email have been updated since the date/time noted in step 2

A workaround is not possible as the fix is in the Java code base.