Merge "Split predictive back bitmask flags into a few boolean flags." into tm-dev