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

Change-Id: Ib4def8be7883cd4a524207ad35b1adb931a6b3da