Merge "Always recreate TaskbarActivityContext" into main