Merge "Null checks on content resolver query"