PAHMA-1065: 'switch apps' improvements, other tweaks