Merge "Prevent callback registration when back flag is disabled" into tm-dev