Merge changes I5ba45a43,I152447bf into main

* changes:
  [PM] Support material AlertDialog (5/N)
  [PM] Support material AlertDialog (4/N)