Merge "Consume pending display config change with multiple remote callbacks" into udc-qpr-dev-plus-aosp