am 9cfa9c7a: am f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb

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