Merge "Disable desktop mode button on app handle unless desktop mode enabled" into main