Merge "Update external display property in hardware_composer."