Fix view management bugs

Waqar Ahmedrequested to merge
work/fix-465811 into master

Fixes for

BUG: 465807 BUG: 465808 BUG: 465811

All three are in separate commits with a test for each bug added to the KateViewManagementTests.

Merge request reports