Merge "Force-flush state sync on texid change" into lmp-mr1-dev