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

* commit '96ca2cfd087078e4042f9ab9678c77dea136eefe':
  Clearing junk layout for add wifi dialog in settings.