Merge "Add APIs to control the external display state" into main