Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev am: 0858d08a88 am: 93e4720813
am: c31b8c95ad
Change-Id: I552e9467d11d648e00c337dc711ad56fbab9dd27
This commit is contained in: