Merge "Add brightness throttling map for concurrent displays"