Merge "Fix crash when decrementing data usage request" into tm-dev