Merge "Revert "Make sure display config is updated when cutout is changed"" into tm-dev