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

Change-Id: Idbac59d7e0af10108c20ece5dc42b8d8f236f512