Merge "don't call setSize() when creating SurfaceControl" am: 57e98b19be am: e332fe4b3d
am: 762b60ce74

Change-Id: I0fd2cc4e3edf9a5ee2e52b45c00368ae165e2c40