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

Change-Id: I4a516ef8a56a0241a8c257dbaabed048d9cd1de4