Merge "Prevent view ids collisions in the workspace. Bug #2498787"