Merge "Adde back check to make sure Activity.recreate() is called on main thread." into pi-dev