Merge "Remove unused variables in FullscreenDrawParams and PreviewPositionHelper" into main