Merge "Use merged NetworkTemplate to query data usage" into qt-dev