Merge "Provide a timeout for SurfaceControl" into rvc-dev am: 6b9d875d27 am: 6500bd666c am: 1fe6b286be

Change-Id: I1168686dd26c7e756c3fe98d9876c3b2dfdf3c87