Merge "Remove unsafe cast in Client::createWithSurfaceParent" into rvc-dev am: 547bea0331

Change-Id: I139535ca31ece474ac4f0e47eaae72c0982c496d