Merge "[CDM] Update binding flag for self-managed apps" into tm-dev