Merge "SF: Redesign API to query display information"