Merge "Update unsupported split app error text" into tm-qpr-dev