Merge "Properly reset source code buffer" into studio-1.0-dev