Merge "Add margins to KQS view that is triggered from taskbar" into main