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

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