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

* commit '25a83393e6a49b136eb7b58eb2f0b3f00b915f2e':
  sf: Add a NULL check in getDisplayConfigs