Merge "Revert "AdapterService: Keep lists for profile states""