Merge "Wait for aaf if enabled"