Merge "Removing UiThreadHelper and moving code to corresponding classes" into tm-qpr-dev