layers: MR108, Merge related updates and fixes

Also removed obsolete query test case from vkbase test
3 files changed