Merge "UX improvements to the restrictions PIN" into klp-dev