Merge "Fix PixelCopy & BQ crop" into sc-dev