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

Change-Id: I4f31f2cbc3a6c897d31591d521df032b9cec7002