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

* commit '23abefef00b4d47bb97b2597f74c9dae6a169286':
  Remove wifi scan-always dialog.