Merge "handle_compcache: update props to match MemoryManagement in settings" into ics