Merge commit '75823339cd03e5b25b576cd7a2b5941254017c4a' * commit '75823339cd03e5b25b576cd7a2b5941254017c4a': Fix a small bug when granting permissions through activity results.
Merge commit '75823339cd03e5b25b576cd7a2b5941254017c4a' * commit '75823339cd03e5b25b576cd7a2b5941254017c4a': Fix a small bug when granting permissions through activity results.