Merge "Reconfigure display info. after configuration changes." into nyc-dev