Merge "PSS permission dialog - Add missing hover and focus states" into main