Merge "Fix crash when trying to dismiss dialog" into tm-qpr-dev