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

Change-Id: Id022aed80b4c459db61d3fc8e9a0066c73e95e28