Merge "Add a bugfix flag for relayout issue" into main