Merge "[DO NOT MERGE] Add centralized DisplayTracker for SystemUI" into tm-qpr-dev