Merge "Wait more time for activity start." into sc-dev