Merge pull request #14814 from eeejay/bug-940633

Bug 940633 - [Cost Control] Fix alignment of checkboxes in usage tab.
(cherry picked from commit f0ce4f4ef5ba10fd147fbed2a4eb5d0fc2e4324c)
Merge pull request #15051 from davidflanagan/bug939962

Bug 939962: set the willReadFrequently flag when creating the 2D context... r=snorp
(cherry picked from commit bb2d680da76b31fa4e33e00b07af0df3d0285fa2)