Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev