Merge proposals dependent on lp://staging/~jeremywootten/pantheon-files/fix-1621637-differentiate-same-tab-name

1. fix-1621637-differentiate-same-tab-name
2. Dependent merge proposals