Merge "desktop-exploded-view: Add aconfig flag" into main