Merge "Remove the "+" button on the help menu if no secure vpns can be created" into sc-dev