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

Change-Id: I3f6d5f10ababa65df95d1499a6411c39ac49189c