Merge "[pm/incremental] minor fix for unbind timing" into sc-dev