Merge "Disable styling for checkboxes and radios on non-js browsers"