Merge "Move UnionDecorationHandler to Launcher" into main