Merge "Adjust SurfaceView visibility on parent change" into qt-dev
am: f1c4f30c54

Change-Id: I6d9dc4fe3df03bcc0380be67e474d5063b73241d