Fix regression with defaultDisplay adjustments
am: f02523bf4b

Change-Id: I7e96a95bcb75ee0b286e73024f62391cc1b759dd