Merge "Remove ApiQueryImageInfo::(getProperties|getPropertyDescriptions)"