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

Change-Id: I9bcc98e0e8af5e7f27977a1fdbfbd54f6a475477