Merge "Use activity as context." into lmp-mr1-dev