Re-group formula cells before we do recalc on load (for xlsx).

Change-Id: Iae6177433f05875e014de50eb4100fa381ddafdd