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

Change-Id: I55511b95f618926d4cf272d6bd900ecbbda0a267