Merge \\\"Only use one SurfaceControlWithBackground per AppToken.\\\" into nyc-dev am: 55427a6650 am: 518c3a109e
am: e9d27e58b9

Change-Id: Ie92b7947203d579b56798689d8e0448ebc609ce3