Merge "Attempted fix for IllegalStateException" into tm-qpr-dev