Merge "Dialog fixed width is 100% when screen width is under 320dp" into nyc-dev