Merge "Change the intent flag to immutable" into tm-qpr-dev