Merge "composer: restart feature enabler client on composer restart" into display.lnx.9.0.r1-rel