Merge "Added new API to support UX for external device permission" into main