Merge "Maintain separate "restrict background data" flag."