Merge "Update the scale while updating the drawGL functor"