Merge "Dialog theme overlay should reset window fixed width and height" into nyc-dev