Merge "FocusRequest token can be nullable" into tm-dev