Merge "Support4Demos: Don't subscribe pages twice"