Merge "Require that persistable Uri permissions be taken." into klp-dev