Merge "PSS fix permission dialog not re-showing after config change" into main