Merge "PSS: use material spec colors for permission dialog popup" into main