Merge "TIF: Keep recording sessions while changing user" into nyc-dev