Merge "Fixing UI Crash" into tm-qpr-dev