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

Change-Id: Id555122ead8a893892c1fb976d0e58efec9686b0