Merge "Update PNO scan timeout to 90 seconds" into tm-dev