Fix alignment of form grid inside non-form grid (bug 909924)