Merge "Change storage check timeout from 300ms to 5mins" into sc-dev