Merge "Add a toggle on whether or not to prompt the user on long-running FGS" into tm-dev