Merge "Using default timeout for 3-button QS"