Merge "Support4Demos: Don't subscribe pages twice" into nyc-support-25.2-dev am: 332d5d57b2
am: 187d971aab

Change-Id: I29e7d4647482c7ab79cf8d5bf57dbb9f17c6baa2