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