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