Merge "Keep access point list updated once in short time"