Merge "Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)" into lmp-dev