Merge "SF: Initialize DisplayDevice with the active config index" into pi-dev
am: 384bf40ae9

Change-Id: Ia478c6c323073cfbcbea86a446c433a25bfc8b3d