Merge "Add stacking to the NetworkStateTrackers." into jb-mr2-dev