Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev