Merge "Allow FGS start within a grace period after its activity going to BG" into sc-dev