Merge "[adb] Cache features set inside the client process"