Merge "don't call setSize() when creating SurfaceControl" am: 57e98b19 am: e332fe4b am: 762b60ce am: 607244a1 Change-Id: I1b6ef96c0b9f15eda6296e5e9fbdb072f66d9b91