Merge "[DO NOT MERGE] [Companion] Call notifyDataSetChanged on main thread" into pi-dev