Merge "Fixes a NPE in the DisplayResolutionTracker."