Merge "Remove unnecessary offset from the app label ICU string" into tm-dev