* commit 'e667e41bb60cbe5e6bde545ecaf1c7d9c8b36af1': Bugfix: use the correct user for ContentResolver calls