Merge "ContextImpl: Keep DisplayAdjustments and Display in sync" into nyc-dev