Merge "Remove the timeout which used for cleanup splash screen" into sc-dev