Merge "Add per-display Configuration change reporting"