Merge "Handling activity recreate due to configuration changes in the middle of the long fling" into ub-launcher3-edmonton