Merge changes from topic "concurrent-extensions"

* changes:
  Fix CTS test on devices not supporting concurrent display
  Creates implementation for Concurrent displays