Merge "Delay test for APF activation after screen-off" into main