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

Change-Id: I8f4eae6fe2ab09cd0b14473cba7d4dbbc42dc469