Merge "Fixed various issues around cross-fades"