Merge "Revert "Revert "Tonemap in RecordingCanvas"""