Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev