Merge "Bug 473900 - FixedSummaryRowLayer does not update if body data changes"