Merge "Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer" into main