am 28d3dbf9: Merge "Remove wifi scan-always dialog." into jb-mr2-dev

* commit '28d3dbf969c4c7965ea44bfe4b54095af5356970':
  Remove wifi scan-always dialog.