Merge "bugfix 5340803 Deleted panorama still shown."