Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev