Bugzilla

### Beta/Release Uplift Approval Request
* **User impact if declined**: Invalid custom margins can lock the UI
* **Is this code covered by automated tests?**: Yes
* **Has the fix been verified in Nightly?**: Yes
* **Needs manual test from QE?**: No
* **If yes, steps to reproduce**: 
* **List of other uplifts needed**: None
* **Risk to taking this patch**: Low
* **Why is the change risky/not risky? (and alternatives if risky)**: This was already verified by QA, but if it is too risky to uplift both patches, we can hold off
* **String changes made/needed**:

Sorry, I believe the first patch would not require beta uplift

Sorry, I believe the first patch would not require beta uplift, as it should have made the cutoff for 84