Merge changes from topic "am-b0c712d1-c83b-40f2-a3f1-53f7e2d67e9f" into ub-launcher3-master

* changes:
  [automerger] Handling activity recreate due to configuration changes in the middle of the long fling am: 16593d7932
  Handling activity recreate due to configuration changes in the middle of the long fling