Merge "Adde back check to make sure Activity.recreate() is called on main...
Merge "Adde back check to make sure Activity.recreate() is called on main thread." into pi-dev am: 5f8e42f7
am: a0f73258
Change-Id: Ib0e04145df03616a1b0109634d55ea6972a76b6d