Merge "Add NB-IoT inactivity timeout duration for demo mode" into 24D1-dev