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

Change-Id: I678cd534ad2752fa24691962b771ecede66545e6