Merge "Add API for SHELL command to set the capabilities request timeout." into sc-dev