Merge "Fix double help icon in wificalling screen" into pi-dev