Merge "RIFT-16172: Project switch does not affect polling and socket pages." into...