CLC-3586: Replace $timeout with $scope.$evalAsync() when possible
https://jira.ets.berkeley.edu/jira/browse/CLC-3586
Merge pull request #2644 from christianv/CLC-3586

CLC-3586: Replace $timeout with $scope.$evalAsync() when possible