Merge "[AAPM] Add APIs for support dialog and identifiers for features" into main