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

Change-Id: Icd60c59691d8a563a5e47cd56c9b677df708beb9