Merge "Gallery3D: Remove unnecessary variables"