simplify, cleanup surface handling infrastructure

Mentioned in commit ffc234126746aad2f05564ab9dc76baecf68f960

Mentioned in commit 2fa87774407c76d4ac8311a27efa56549d6a02e3

Mentioned in commit 8cef33327a7057c527ddbcfcb12c95acc984faaa

Mentioned in commit 60e0b4c8a0218ec96a4acd81bd3263d9a6d310fd

Mentioned in commit 30eb40b4e347f0b41e93e50ada4594498b1fe9ed

Mentioned in commit f986fbe44d0dedd90286d08b290ccfc2519b74d0

Mentioned in commit 8b938c06e82fdf51f75863c9259f82a89b467804

Mentioned in commit 63c185f2f4b5bc0a598de936a152e8d27bb51525

Mentioned in commit eac3922e280e782c0a1c78597bdd0147627ab3f4

Mentioned in commit 92d8da979a63f06238fec346f4d0ee4bbb5741bb

Mentioned in commit 941d3881525653e4572e31aa5d7f6d9db358c8df

Mentioned in commit 61c96aa945217ac16a0b54f4a0dafa32725970c7

Mentioned in commit 4a2bc1cfe735f71006a801e2d815b3f3ff242d71

Mentioned in merge request !77 (merged)

Mentioned in commit dc4d93137caa71fa5188791de25377a7b6321b0e

Milestone changed to %Version v1706

Work to continue for 1706

Mentioned in commit 05692bab9b971b2bdbc7a7938ca25b345ceb27f0

Mentioned in commit 85ad5147bd66904c7506d2995d2fc5021186fce9

mentioned in commit f67767da06e647c65d5bd1f7321cd5d0eab0846c