Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev