Merge "Do not bundle config change of no ui processes" into main