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

Change-Id: I48063a31506ef517becae06d85882441d92a5931