Merge "SideBySide2: Honor manual vs. automatic reviewed preference"