am 78670560: am 96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev automerge: f41c6c4

* commit '78670560cddf0f1e2cff7dab57b2ac768f917367':
  Clearing junk layout for add wifi dialog in settings.