Merge "[Relayout] Part 1: Define flags" into main