Merge "[HWUI]: fix residual line on FrameBuffer"