Merge changes I049657db,I30950742 into display.lnx.9.0.r1-rel

* changes:
  Revert "composer: restart feature enabler client on composer restart"
  Merge commit '1cd77e0b1679101cef3b83857eea5c292c494a80' into display.lnx.9.0.r1-rel