Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev