Merge commit 'bbe14a1758a5b99689b7aa13a6d4f58e61705ebf' into eclair-plus-aosp * commit 'bbe14a1758a5b99689b7aa13a6d4f58e61705ebf': fix [2074427] SurfaceView doesn't disappear on GONE
Merge commit 'bbe14a1758a5b99689b7aa13a6d4f58e61705ebf' into eclair-plus-aosp * commit 'bbe14a1758a5b99689b7aa13a6d4f58e61705ebf': fix [2074427] SurfaceView doesn't disappear on GONE