Merge "Only allow one relayout with sync per sync request"