Merge "Always send configuration change if only desk uiMode changed" into main