Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev