Merge "Allow line wrap in "Add new account" buttton" into mnc-dev