Merge "sdm: handle CWB registration during TUI exit/entry" into display.lnx.9.0