Merge "sdm: Fix destination scalar caching logic"