am f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb

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