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

Change-Id: Ibcc6cea49767569c80df1c18656b5222b3703a3a