Merge "Fixed issue where HardwareBufferRenderer was not preserving contents" into udc-dev