Merge "Gate the new FGS time limit logic with a targetSdk check." into main