Merge "Fix wifi launch intent" into pi-dev