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

Change-Id: Ie35241fd2ee76a22356eeee743bead6de9b6cf3e