Merge "Increase the Retouch buffer size from 550,000 to 600,000"