Merge changes I46acd27a,I70b322e1 into honeycomb

* changes:
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568