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

Change-Id: I96d579dbe69733bf7211e97a423071fa61be494a