Merge "Don't call FGS onTimeout if app is currently in TOP state." into main