Merge "Remember wifi country that's set before boot" into jb-mr2-dev