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

Change-Id: Ie5df4749f68c3eeb02ef7abaad4d0b1522667dc7