Bug 984243 - Increase the timeout value and force terminate when displaying the menu
Merge pull request #18223 from crh0716/984243_v1.3t

Bug 984243 - Increase the timeout value and force terminate when displaying the menu r=evelyn