Merge "OnTrimMemory plumbing"