Merge "Calling recreate() instead of finish() so that the activity life cycle is handled properly" into ub-launcher3-dorval-polish
am: 36faf14d34

Change-Id: I52c292c8442d7100b6f72cbc503715dba663a305