Merge "Add centralized DisplayTracker for SystemUI"