Merge "Check mMediaProvider for null" into pi-dev