Merge "ColorFade: asyncronous cleanup on display remove" into main