Merge "Allow translation should also work on non-resume state" into sc-v2-dev