Merge "Apply material 3 to fill dialog/save ui" into tm-dev