Merge "Correct Wifi Share UI margins and capitalization"