LPS-34631

This should fix looping and remove the color picker and thick border. Also Note that on latest Trunk checkboxes no longer work due to LPS-38613, so you will need to test before then.