Merge "Remove FGS timeout ANR logic." into main