Merge commit 'a76a792f52b8dd7f955bcf781a58c540a57de5d4' * commit 'a76a792f52b8dd7f955bcf781a58c540a57de5d4': fix [2074427] SurfaceView doesn't disappear on GONE
Merge commit 'a76a792f52b8dd7f955bcf781a58c540a57de5d4' * commit 'a76a792f52b8dd7f955bcf781a58c540a57de5d4': fix [2074427] SurfaceView doesn't disappear on GONE