Merge "Use new backgrounds in wifi setup for xl" into honeycomb