Merge "Fix package visibility broadcast regression" into tm-dev