Add the ability to change all surfaces at the same time
Merge branch 'feature/all-surfaces' into development