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

Change-Id: I1b6ef96c0b9f15eda6296e5e9fbdb072f66d9b91