Merge "Removing unused SearchSessionManager" into tm-dev