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

Change-Id: Ibc2098a9d175645448ce99297ca6985a3acccf04