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