Merge "Fix to show the correct HW accel background in the preview window."