Merge "Fixing a couple of crashes when mContentUri is null."