Merge "Boost priority of short-running SF FIFO threads slightly." into nyc-mr1-dev