Merge "Force relayout if sync operation is requested explicitly" into sc-dev