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

Change-Id: I9c110947941b4ccb9404b350eb507ec30e701ffc