MP1-4292 : Fixed ViewModeSwitcher problems reported by wouter1971 that were not fixed by the first approach.