Merge "Merge "TIF: Keep recording sessions while changing user" into nyc-dev am: 2bea394d am: 26cf15d8" into nyc-mr1-dev-plus-aosp