Merge "Revert "Tonemap in RecordingCanvas""