Merge "Enable new data usage settings features." into pi-dev