Merge "Add capability bit for the cached scan data feature" into main