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

* commit 'e8bdcc67c5b560212c9af3cfb6d922fcaecada91':
  sf: Add a NULL check in getDisplayConfigs