Merge "Use longer connection wait time for PNO scan" into tm-dev