Merge "Throw when taking non-existant Uri permission." into klp-dev