am d725b1a9: am aa156251: Merge "progress_large id defined incorrectly"

* commit 'd725b1a92ed1137daf3855f485dafd38429bbb45':
  progress_large id defined incorrectly