Changed FB surface lock tracking logic