Merge "Avoid setting the same NavBar/StatusBar color" into main