Merge "Fix missing permission check when saving pattern/password" into nyc-dev