Merge "Refactor all apps to depend on activity context."