am aa156251: Merge "progress_large id defined incorrectly"

* commit 'aa156251eb0414b8c6546c98769789dc28b38140':
  progress_large id defined incorrectly