Merge "Ensure controller is attached before applying state" into tm-dev