Merge "Fix Display SurfaceControl leak" into rvc-dev am: 87293fda8d

Change-Id: I6cefa46725e200f33ba92b7505b3a0d699694deb