Merge "Taimen: wifi: set inactivity time"