Merge "Refactor ActivityThread cache - Baby step 1."