Merge "Move mPackageSessionIds and related code into Rollback (3/n)"