Merge "[0/n] Create bug fix flag for async CompatUI relayout" into main