MUS-85: Bug fix on orientation change