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

Change-Id: Ibc3ad92621f99e2852668a392f18f6d63b21f51a