Merge "[ECM] Pass settingIdentifier to dialog" into main