Merge "Fix App data usage title not being translated." into pi-dev