Merge \\"Only use one SurfaceControlWithBackground per AppToken.\\" into nyc-dev am: 55427a6650
am: 5bf74ae1b9

Change-Id: I5f09aa883e01593ddf0fad9b5f14201619e652a5