Merge "Don't apply encryption password requirements for secondary users" into klp-dev