Merge "Support wifi display settings on tablets."