Merge "Prune shared users that the system declares but does not use" into klp-dev