Merge "fix google widget timing issue"