Merge "Fix the position set for setGeometry calculation."