Merge "RIFT-16181: Project switch must affect non-polling/non-socket based pages...