Merge "Disallows setting when user restriction applies" into klp-dev