am 85e271d0: Merge "sf: Add a NULL check in getDisplayConfigs"

* commit '85e271d051770fdd5bb1bb017255f735cbd45459':
  sf: Add a NULL check in getDisplayConfigs