Merge "Fix SGLM child position bug" into lmp-mr1-ub-dev