Merge "Fixed lingering network bitmask not set issue" into tm-dev