Merge "Use context instead of activity"