Merge changes Ife3ef43f,I50ec5d8b into pi-dev

* changes:
  SF: Test coverage for onInitializeDisplays
  SF: Test Coverage for setDisplayStateLocked