Merge "sf: Add a NULL check in getDisplayConfigs"