Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev
am: 0858d08a88

Change-Id: Idc8f2c1685c11d301d9fb4323a21e6d14c4ae594